From: Boyuan Yang <byang@debian.org>
Date: Sat, 23 May 2020 14:46:25 +0000 (-0400)
Subject: debian/control: Use system libmarisa
X-Git-Tag: archive/raspbian/1.1.9+ds1-4+rpi1^2^2~127
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=6810eccff34528e784bbe4b2f44fcafd8eb0c9fb;p=opencc.git

debian/control: Use system libmarisa
---

diff --git a/debian/changelog b/debian/changelog
index aeab62d..8e0e605 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-opencc (1.1.1-1) unstable; urgency=medium
+opencc (1.1.1-1~exp1) experimental; urgency=medium
 
   [ 肖盛文 ]
   * New upstream version 1.1.1
@@ -24,7 +24,12 @@ opencc (1.1.1-1) unstable; urgency=medium
   * delete unused patch: use-system-libraries.patch
   * d/watch: use @PACKAGE@ @ANY_VERSION@@ARCHIVE_EXT@
 
- -- Boyuan Yang <byang@debian.org>  Sat, 23 May 2020 10:41:31 -0400
+  [ Boyuan Yang ]
+  * ds: Do not include bundled gtest and libmarisa.
+  * debian/rules: Explicitly disable building bundled libmarisa.
+  * debian/control: Add new build-dependency libmarisa-dev.
+
+ -- Boyuan Yang <byang@debian.org>  Sat, 23 May 2020 10:45:53 -0400
 
 opencc (1.1.1-1~exp1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index ed2533b..1bee22e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends:
  doxygen,
  graphviz,
  libjs-jquery,
+ libmarisa-dev,
  libtclap-dev,
  python3:any,
  rapidjson-dev,
diff --git a/debian/rules b/debian/rules
index 8054960..50e26c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,8 @@ override_dh_auto_configure:
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DBUILD_DOCUMENTATION=ON
+		-DBUILD_DOCUMENTATION=ON \
+		-DBUILD_BUNDLED_LIBMARISA=OFF
 
 execute_after_dh_auto_install:
 	ln -sf /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/opencc/doc/html/jquery.js